server: fix root disk size on vm reset by shwstppr · Pull Request #4638 · apache/cloudstack

shwstppr · 2021-02-02T07:21:57Z

Description

If VM details contain rootdisksize, volume entry in DB should reflect correct size when VM reset is performed.

Fixes #3957

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

On resize of ROOT volume add detail in the VM for `rootdisksize` which will allow resizing root disk when VM reset is performed. Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

DaanHoogland · 2021-02-16T10:30:11Z

code looks good @shwstppr but have you verified that the resize code is being called on a vm reset?

shwstppr · 2021-02-16T10:47:02Z

@DaanHoogland I stopped work on this after your comment on the issue and reconsidering reset behaviour.
I think to support not reverting root disk size to the original value, maybe we can have a new param in resetVirtualMachine API. Default behaviour will revert size but user can call the API with the new flag to not revert it. However, that may require additional changes and testing.

DaanHoogland · 2021-02-16T14:35:02Z

@shwstppr (cc @Spaceman1984 ) the consensus so far is to revert to the template including the template root size disk. making it optional is outside of this scope.

yadvr · 2021-02-18T12:52:56Z

cc @Pearl1594 @harikrishna-patnala @nvazquez

…ize wasn't overridden during deployment

Pearl1594 · 2021-03-29T06:44:56Z

@blueorangutan package

Pearl1594 · 2021-03-29T07:27:09Z

@blueorangutan package

blueorangutan · 2021-03-29T07:28:04Z

@Pearl1594 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-03-29T07:45:40Z

Packaging result: ✔️ centos7 ✔️ debian. SL-JID 271

Pearl1594 · 2021-03-29T08:07:19Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-03-29T08:08:05Z

@Pearl1594 a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

blueorangutan · 2021-03-29T23:18:51Z

Trillian test result (tid-276)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 53529 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4638-t276-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_network.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 80 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_05_ping_in_cpvm_success	`Failure`	15.33	test_diagnostics.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true	`Failure`	319.79	test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Failure`	605.11	test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	`Failure`	530.36	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Failure`	558.01	test_vpc_redundant.py

Pearl1594 · 2021-03-31T04:46:00Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-03-31T04:47:02Z

@Pearl1594 a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

blueorangutan · 2021-03-31T17:21:22Z

Trillian test result (tid-306)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44095 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4638-t306-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_03_deploy_and_upgrade_kubernetes_cluster	`Error`	3774.44	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	128.96	test_kubernetes_clusters.py

DaanHoogland

looks good, doing a new build/smoke test run on kvm

blueorangutan · 2021-04-09T08:36:11Z

Packaging result: ✔️ centos7 ✔️ debian. SL-JID 371

Pearl1594

Verified behavior. LGTM

Created a VM with a template of size 3GB but overrode root disk size to 8GB. Reinstalled the VM. The re-installed VM's root disk size = 8GB
Created a VM with a template of size 3GB but overrode root disk size to 8GB. Performed a volume resize operation - volume size (root) = 15GB. Reinstalled VM - the reinstalled VM's root volume size = 15GB
Created a VM with a template of size 3GB. Resized the volume of the VM to 8GB. Reinstalled the VM. Re-installed VM's root disk size = 3GB - DB updated as well

sureshanaparti · 2021-04-09T11:12:19Z

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

+            if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.ROOT_DISK_SIZE) == null && !newVol.getSize().equals(template.getSize())) {
+                VolumeVO resizedVolume = (VolumeVO) newVol;
+                resizedVolume.setSize(template.getSize());
+                _volsDao.update(resizedVolume.getId(), resizedVolume);


@shwstppr it is possible to handle this case while allocating duplicate volume with template ?

@sureshanaparti Duplicating using template, won't that affect other existing values of the entry - folder, path, etc?

I missed this comment, if we need to address anything additional pl raise a new PR @shwstppr @sureshanaparti

sureshanaparti · 2021-04-09T11:15:35Z

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

+
            // 1. Save usage event and update resource count for user vm volumes
            _resourceLimitMgr.incrementResourceCount(newVol.getAccountId(), ResourceType.volume, newVol.isDisplay());
            _resourceLimitMgr.incrementResourceCount(newVol.getAccountId(), ResourceType.primary_storage, newVol.isDisplay(), new Long(newVol.getSize()));


newVol here doesn't have updated template size, refresh it after the template size is updated in DB.

@sureshanaparti same object is been cast to VolumeVO and size is updated at 6682-6683. newVol will return the updated size

yadvr · 2021-04-10T08:02:06Z

Merged based on Daan, Pearl's review testing and smoketests

If VM details contain rootdisksize, volume entry in DB should reflect correct size when VM reset is performed. Fixes apache#3957 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>

server: fix root disk size on vm reset

da7689e

On resize of ROOT volume add detail in the VM for `rootdisksize` which will allow resizing root disk when VM reset is performed. Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr linked an issue Feb 2, 2021 that may be closed by this pull request

Root disk size reverts to its template size after rebuild #3957

Closed

shwstppr added this to the 4.14.1.0 milestone Feb 2, 2021

yadvr modified the milestones: 4.14.1.0, 4.15.1.0 Feb 4, 2021

yadvr assigned shwstppr and Pearl1594 Mar 24, 2021

Resize root disk to original disk size (template size) if root disk s…

fbfb1f4

…ize wasn't overridden during deployment

yadvr unassigned shwstppr Apr 6, 2021

yadvr requested review from Pearl1594 and sureshanaparti April 6, 2021 12:17

shwstppr marked this pull request as ready for review April 9, 2021 06:24

shwstppr requested a review from DaanHoogland April 9, 2021 06:25

DaanHoogland approved these changes Apr 9, 2021

View reviewed changes

Pearl1594 approved these changes Apr 9, 2021

View reviewed changes

sureshanaparti reviewed Apr 9, 2021

View reviewed changes

yadvr merged commit 6b1c94e into apache:4.14 Apr 10, 2021

yadvr mentioned this pull request Apr 10, 2021

Root disk size reverts to its template size after rebuild #3957

Closed

Conversation

shwstppr commented Feb 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

DaanHoogland commented Feb 16, 2021

Uh oh!

shwstppr commented Feb 16, 2021

Uh oh!

DaanHoogland commented Feb 16, 2021

Uh oh!

yadvr commented Feb 18, 2021

Uh oh!

Pearl1594 commented Mar 29, 2021

Uh oh!

Pearl1594 commented Mar 29, 2021

Uh oh!

blueorangutan commented Mar 29, 2021

Uh oh!

blueorangutan commented Mar 29, 2021

Uh oh!

Pearl1594 commented Mar 29, 2021

Uh oh!

blueorangutan commented Mar 29, 2021

Uh oh!

blueorangutan commented Mar 29, 2021

Uh oh!

Pearl1594 commented Mar 31, 2021

Uh oh!

blueorangutan commented Mar 31, 2021

Uh oh!

blueorangutan commented Mar 31, 2021

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Apr 9, 2021

Uh oh!

Pearl1594 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

shwstppr Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr Apr 10, 2021

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

shwstppr Apr 9, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr commented Apr 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

shwstppr commented Feb 2, 2021 •

edited

Loading

Pearl1594 left a comment •

edited

Loading